Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 28 Jun 2011 15:41:56 +0000 (08:41 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 28 Jun 2011 15:41:56 +0000 (08:41 -0700)

Trivial merge